fixup: use bReturn instead of directly return true/false