LPS-30298 Use the property value instead of true