Fix for 1.8.7 issues with Beaker