Fixing controller base class