Removed extra check for Z

I have changed this component so many times! I should devote a full day
and get all this minor bugs solved.