Try to fix Issue#8