#48 fix controller