Fix for v1.3.1