Fix form without comments