Definitely remember doing this already. Perhaps didn't commit?
Fix return values