Fixed For 1.7.0 and higher.