fixed bug pull this one