fixing potential issues
fixing potential issues