updated for v1.17b15