Fix for bug on single site instances.
Merge branch 'kyle'