Fixed bug in user-data