Update for v1.5.2 compatibility