#344 bug fixed