Bug fix for usage with active form