Fixed #490