Fixed #491