Fix Isses 94

https://github.com/rvalyi/ooor/issues/94