#63 | fixing if-then issue