Bug fix - thanks to rodeto, Andrzej and especially postiffm