BPM-29 bugfix