Bug fix for commit 8f4e6dd4c7c9144f5cff7bc6a2070f97d95b42ff.