Fixed #458