Probably fixed bug #33.