Fixed #484