fixing hardcoded bug