improved fixture controller
CS fix
Merge pull request #1793 from Ragazzo/fixture_controller_improved

improved fixture controller