Fixed issue #247: Still working and fix major broken system