Simplistic attempt to address #22