Fixing #47