issue 121 fixed controllers