Fixed #556