Suggestion: remove this change until we fixed #841