WIP - another HHVM fix