Added compatibility with 1.5.1 while preserving 1.5.2 compatibility.