Added fix for Z-A type