Simplifying to remove conditional as requested by @mpdehaan