slightly fixed bug