Simple fix to address #157