Bugfix for 0.45.1