Fix #3 - Form became invalid

I believe this fixes it but could not fully test it as I cannot
reproduce the actual problem