Fixed #588