Fix for bundle