Use constructor flag instead of automatic fallback