fixed controller before merge