Fixed no user bugs