Fixing weird instantiation