fixed bug in latest commits