Probably fixed bug #32.