Fixed #679