Fixed -y issue