Bugfix for 087fe65.