Issue#340