Another attempt to make RTD happy