Copy official behavior from aldeed's package