Fix/mixins with trailing space

Closes #951