Fixes regression in nested forms