fixed return-not-found (broken port from 0.10)