Issue#698