Fix issues
Fix error