Improve air feign code (fixes #236)