Work around for 1.8.7