BUG_FIX: IF parser fixes