silo fix
Merge branch 'hotfix/silo_fix'