#1006 Add fix to v0.13.4