#386 Moved setting type to method