fixed hardcoded code