bug fixs 3