Added defined() check back.