Fix for a regression introduced at 14cea94