Small bug fix with Forms