Fix return wrong placed