Fixing #18