Temp fix until I can get to properly fixing it.

Relates to #117