works with 1.9.3 as well