fix for multiple schemas