fixing #24
fixing #24