manual return fix.