Fixed form bug