Trying to fix #5 better as it still has a small chance to occur