fixing potential issues
Safety features