Userstamps fix