Small fix to swap forms