#164 I think this fixes it. Verified and seems to be working