#44 use before instead of endIf