(Asking Adam to find out if we still want the current behavior)