Solves #21