Fix for bundle controller bug
Another fix
fixes