Fixing spaces issues