Fixing bundle issue.

WIP
#4855