Fixed all control problems