Fixing #78