fixing potential issues"