try to fix the bug but there still some problem