Fix for Github issue #13