Fixing hardcode -_-