Fix bug in NAS server from 1fbec2f