Made work with latest compiler