bugfixes for the Department