fixed form interaction issues