Solves #62