Forms bugfix