Different attempt at 1.8.7 support