ZS6 deployment fix