feature/issue@24

Fixed.