controller improved
Merge pull request #2304 from Ragazzo/fixture_controller_improved

controller improved