Really fixing SE surface issue.