Simple fix for the swap plugin. This needs to go into 3.9.1