should fix some of error