Fix for Github issue 1