Fixed #483