Moved the call to getConcreteClass() to inside of make()