Fix for the bug at issue #1