BAC-1266 small bugfix