Fix for issue that was blocking #64