Fixed constructor return type