Response-fix for 1.3.6