user models fixed