Fixed for new release