fixing #18