Fixed #477