fixed hardcoding issue