fixed y/n condition