Bugfix for a problem that for some reason isn't present on dev system