merge curCSS fix from commit 76a119786078235a6f2522c32db2aca989056aac