Remove trailing spaces
Attempt to make it work without much luck