fix Issue#6