fix simpleform wrappers