this maybe fix the bug