Fix for bug introduced by commit 67c092828d520e95d620f4c5a5a5cc90fdbd0466