This solves #169