fixing #24