Ivor

I'd also like to see this fixed. AndreCAndersen's suggestion seems like a good solution