[1.8.7] spec compatability fix