attempt to address #23

This should do it...