Attempt to support 5.8