Fixed #420