Added fix for multile sites