Changed def to val back