Make code 1.9.3 compatible