BIT #747 fixed