Fixed Issue #137

Need to test this one…but I think i've got this fixed