Try fix 5.3 compatibility for closure... Take 2