Fix issue with condional statements vs conditonal declarations