fix to support form enhancements