Changed to work with 1.8.7