Create a bug for xblock to fix this issue.