added short circuit one-liner