Tested this with 1.8