APB -> INF, fix #34