Accommodate for 1.7.2/1.7.10 differences