Fixing Controller bug