added work around for subset construction crash