Simple hack to make it more robust
Worst clone hack ever....