Fixed 1.5.2 compatability bug