proposed fix

Closes #77

If anyone has a better way to do this that works, it's open for change.