Prevent the issue re-occurring