Make code 5.3 compatible