Fix #618 - Updated logic so that property only gets set when needed