4-8 fixed bug