Updated according to https://github.com/theodi/shared/issues/437#issuecomment-63934028