fix compile issues
a workaround commit