solves #24