Another attempt to fix compile