fix bug on returning content