Small change for v1.5.3 compatibility