Tweak to handle single cases