Bug fix for commit 60ba1943af5f0af0776961d5534dd2c35c61b6b6