add FIXME comments for the temporary fix of the issue #828 and #839