fixed to work w/ new package