Fixed #441