Fix On-Premise scenario