Fix controller

Merged