Bugfix in previous merge from 2.1