bugs resolved for github as well (32 & 33)sfd modified