+ Added safeguard against old invalid define