Made compatible for 1.2.5