Bug #177 fixed!