Fixing issue with bundleable beans