Fix for Github issue 2