Fixing potential exploit