fixed issue with swap field.