Add level 17, fixes #19