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

Glimpse/Glimpse,SusanaL/Glimpse,elkingtonmcb/Glimpse,paynecrl97/Glimpse,flcdrg/Glimpse,sorenhl/Glimpse,Glimpse/Glimpse,rho24/Glimpse,rho24/Glimpse,gabrielweyer/Glimpse,paynecrl97/Glimpse,sorenhl/Glimpse,rho24/Glimpse,paynecrl97/Glimpse,gabrielweyer/Glimpse,elkingtonmcb/Glimpse,gabrielweyer/Glimpse,SusanaL/Glimpse,paynecrl97/Glimpse,dudzon/Glimpse,dudzon/Glimpse,SusanaL/Glimpse,flcdrg/Glimpse,codevlabs/Glimpse,flcdrg/Glimpse,codevlabs/Glimpse,sorenhl/Glimpse,codevlabs/Glimpse,dudzon/Glimpse,rho24/Glimpse,elkingtonmcb/Glimpse,Glimpse/Glimpse