Fixing #162