removed custom properties conditional test