Whitespace
Fix name resolution always on