Fixed #737