fixed form functionality