Fix for not sanitized values