Fix 145

Bug #145 fixed