solves #24

Solve #24