fixing potential issues