Fixed #538