Fixing #15