BUGFIX: no idea how this worked in test