fixing issues?