Bug fix (#22)