corrected pb with user-change