Fixed previous fixes