Fixed return values showing on wrong pages