Fix bundle resolution