Fix a bashing system issue