Remove cast from ctor