fix Issue #1008

I hope this is better, sorry for the trouble