Tweaked accessors conditional