Fixes the Generator for the BasicObject case