Fixed #836