Fixed small flow issue