Make it compatible for Z