bugfix for bae