Fixed Issue #253

This might not be the ideal fix, but it does work.