some changes to fix it