Fix for hhvm
Fix for hhvm