4-12 fixed bug