Fix #336 - I hope!