Fix wrong conditional flow
Fix wrong conditional flow