fix #609 https://github.com/ThreeMammals/Ocelot/issues/609 (#610)
fix #609 https://github.com/ThreeMammals/Ocelot/issues/609 (#610)


geffzhang/Ocelot,TomPallister/Ocelot,geffzhang/Ocelot,TomPallister/Ocelot