Solves #35