Added type check correction for constructor return statements