Fixed consistent return