Changes based on Github issue 101