Picture-User mapping fixed