fixing up conditional