Make it work with the latest compiler