Improved reliability for v 1.3.0