Fixed Issue#349