Fixed return stuff