BUG #112 fixed (I hope so)