Fix for an issue #13