Fix on ZW and WN

Made sure these two option are also triggered sometimes