Fix regression in basic functionality