Fix for 3fd21ae57b (regression)