Works with 1.10 now