Fix for 5.3 and hhvm. This is currently a dirty fix that will need to be done correctly.