Prevent booleans being returned, and allow output (needs cleaning up)