Base controller fixed

Base controller is fixed