fixed controller methods