really really fixed for 1.8.7