fixed issues with special form