BUG: Fixes duplicate class name so that correct constructor is called