Resolves https://github.com/mewwts/addict/issues/17