Fix ZSS-592 and ZSS-595