Fix for user format problems