fixed hardcoded validation