fix for R# 8.0