Working commit on bundling issue.