fixing issues: