Fixed 1.8 issue