Fix for Form2