solves #25