Solves #7