Fix for bundle controller bug