Fixed issues (again \!)