Story 50006219: fixing mapped controllers