Fixed a regression from 2e5b82f6277227b69e9a6c5261a6deb14fff15dc