Bug #256 should go into 1.0.5