Added compatibility for 1.4.7 and lower