Made .fez behavior a bit tidier