Fixed regression from f728894ad2c9c75dd031f8320fcd12b14baf9af6