fixing #6
fixing #6