Fixed build from pull 92