Fixed behavior of within to remove special case